From: Joakim Verona <joakim@verona.se>
Date: Sun, 18 Aug 2013 23:26:26 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=06e4beffef13e1fbc1d7c5f204aec9d240357e7f;p=emacs.git

merge from trunk
---

06e4beffef13e1fbc1d7c5f204aec9d240357e7f